Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 20 Oct 2005 11:35:57 +0000 (12:35 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 20 Oct 2005 11:35:57 +0000 (12:35 +0100)

Trivial merge